From 52ca8630dd206cee8e42ce0ae69d4def7f471cb5 Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Wed, 6 Oct 2004 13:55:20 +0000 Subject: [PATCH] bitkeeper revision 1.1159.103.3 (4163f948kcyGWcvXIMl2qjnflmWhvQ) Make the default for ip none instead of dhcp. Fix variable name for dlist_err errback. --- tools/python/xen/xend/XendDomainInfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index c81c2a0516..dad6c5b452 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1004,7 +1004,7 @@ class XendDomainInfo: log.warning("Unknown config field %s", field_name) index[field_name] = field_index + 1 d = defer.DeferredList(dlist, fireOnOneErrback=1) - deferred.addErrback(dlist_err) + d.addErrback(dlist_err) return d @@ -1018,7 +1018,7 @@ def vm_image_linux(vm, image): """ kernel = sxp.child_value(image, "kernel") cmdline = "" - ip = sxp.child_value(image, "ip", "dhcp") + ip = sxp.child_value(image, "ip", None) if ip: cmdline += " ip=" + ip root = sxp.child_value(image, "root") -- 2.30.2